Adwaita: border radiusses rationalization

diff --git a/gtk/resources/theme/Adwaita/_common.scss b/gtk/resources/theme/Adwaita/_common.scss
index bc4b41f5d5b525d39c45feb13e7f55af7e96b933..267b9ce7cb3c42c0143dfdf3507da9f6f5bca97a 100644 (file)
--- a/gtk/resources/theme/Adwaita/_common.scss
+++ b/gtk/resources/theme/Adwaita/_common.scss
@@ -493,7 +493,7 @@ $_dot_color: if($variant=='light', $selected_bg_color,
   &.osd {
     &.image-button { padding: 13px; }
     color: $osd_fg_color;
-    border-radius: 6px;
+    border-radius: 5px;
     outline-color: transparentize($osd_fg_color, 0.7);  //FIXME: define a color var?
     @include button(osd);
     border: none;
@@ -1123,7 +1123,7 @@ GtkComboBox {
   .osd &, &.osd {
     padding: 13px;
     border: none;
-    border-radius: 6px;
+    border-radius: 5px;
     background-color: $osd_bg_color;
   }
 }
@@ -1134,7 +1134,7 @@ GtkComboBox {
   @extend %inset-bar;
   border-width: 0 1px 1px;
   padding: 3px;
-  border-radius: 0  0 4px 4px;
+  border-radius: 0  0 5px 5px;
 }
 .search-bar, .location-bar {
   @extend .toolbar;
@@ -1549,7 +1549,6 @@ column-header.button.dnd { // for treeview-like derive widgets
   padding: 2px;
   border: 1px solid $borders-color;
   border-radius: 5px;
-  //background-clip: border-box;
   background-color: $bg_color;
 
   box-shadow: 0 2px 3px transparentize(black, 0.5);
@@ -3024,7 +3023,7 @@ GtkColorSwatch {
   &:hover {
     @extend %undecorated_button;
     background-color: transparentize($fg_color,0.9);
-    border-radius: 4px;
+    border-radius: 5px;
   }
   &:backdrop,
   &:backdrop:hover,

diff --git a/gtk/resources/theme/Adwaita/gtk-contained-dark.css b/gtk/resources/theme/Adwaita/gtk-contained-dark.css
index d59f2b085d908f7213175618ebea58b44e0f4d7a..beb41513d61427c776300d6bb9ed7178eae2114a 100644 (file)
--- a/gtk/resources/theme/Adwaita/gtk-contained-dark.css
+++ b/gtk/resources/theme/Adwaita/gtk-contained-dark.css
@@ -572,7 +572,7 @@ GtkCalendar.header .button.titlebutton {
   .titlebar .osd.button.titlebutton,
   GtkCalendar.header .osd.button.titlebutton {
     color: #eeeeec;
-    border-radius: 6px;
+    border-radius: 5px;
     outline-color: rgba(238, 238, 236, 0.3);
     color: #eeeeec;
     border-color: rgba(0, 0, 0, 0.7);
@@ -1744,13 +1744,13 @@ GtkComboBox {
   .osd .toolbar, .osd .inline-toolbar, .osd .search-bar, .osd .location-bar, .toolbar.osd, .osd.inline-toolbar, .osd.search-bar, .osd.location-bar {
     padding: 13px;
     border: none;
-    border-radius: 6px;
+    border-radius: 5px;
     background-color: rgba(46, 52, 54, 0.7); }
 
 .inline-toolbar {
   border-width: 0 1px 1px;
   padding: 3px;
-  border-radius: 0  0 4px 4px; }
+  border-radius: 0  0 5px 5px; }
 
 .search-bar, .location-bar {
   border-width: 0 0 1px;
@@ -4486,7 +4486,7 @@ GtkCalendar.header .scale-popup .button.titlebutton {
   padding: 6px; }
   .scale-popup .button:hover {
     background-color: rgba(238, 238, 236, 0.1);
-    border-radius: 4px; }
+    border-radius: 5px; }
 
 GtkVolumeButton.button, .header-bar GtkVolumeButton.button.titlebutton,
 .titlebar GtkVolumeButton.button.titlebutton,

diff --git a/gtk/resources/theme/Adwaita/gtk-contained.css b/gtk/resources/theme/Adwaita/gtk-contained.css
index 3f9f10c04156a431db416fb74fe6da0550538329..49f336df759f4bd4777335f5598e8f1a963e98f7 100644 (file)
--- a/gtk/resources/theme/Adwaita/gtk-contained.css
+++ b/gtk/resources/theme/Adwaita/gtk-contained.css
@@ -564,7 +564,7 @@ GtkCalendar.header .button.titlebutton {
   .titlebar .osd.button.titlebutton,
   GtkCalendar.header .osd.button.titlebutton {
     color: #eeeeec;
-    border-radius: 6px;
+    border-radius: 5px;
     outline-color: rgba(238, 238, 236, 0.3);
     color: #eeeeec;
     border-color: rgba(0, 0, 0, 0.7);
@@ -1736,13 +1736,13 @@ GtkComboBox {
   .osd .toolbar, .osd .inline-toolbar, .osd .search-bar, .osd .location-bar, .toolbar.osd, .osd.inline-toolbar, .osd.search-bar, .osd.location-bar {
     padding: 13px;
     border: none;
-    border-radius: 6px;
+    border-radius: 5px;
     background-color: rgba(46, 52, 54, 0.7); }
 
 .inline-toolbar {
   border-width: 0 1px 1px;
   padding: 3px;
-  border-radius: 0  0 4px 4px; }
+  border-radius: 0  0 5px 5px; }
 
 .search-bar, .location-bar {
   border-width: 0 0 1px;
@@ -4647,7 +4647,7 @@ GtkCalendar.header .scale-popup .button.titlebutton {
   padding: 6px; }
   .scale-popup .button:hover {
     background-color: rgba(46, 52, 54, 0.1);
-    border-radius: 4px; }
+    border-radius: 5px; }
 
 GtkVolumeButton.button, .header-bar GtkVolumeButton.button.titlebutton,
 .titlebar GtkVolumeButton.button.titlebutton,